Add experimental support for automatic conflict handling Use new content merge functionality in JGit for automatic resolution of conflicts within a file. Change-Id: Ifae8a94709fb60f13e4c79fb6bb77a214ef5f0b7 Signed-off-by: Shawn O. Pearce <sop@google.com>
diff --git a/Documentation/cmd-create-project.txt b/Documentation/cmd-create-project.txt index 099008d..72d7916 100644 --- a/Documentation/cmd-create-project.txt +++ b/Documentation/cmd-create-project.txt
@@ -16,6 +16,7 @@ [\--permissions-only] \ [\--description <DESC>] \ [\--submit-type <TYPE>] \ +[\--use-content-merge] \ [\--use-contributor-agreements] \ [\--use-signed-off-by] @@ -95,6 +96,13 @@ Defaults to MERGE_IF_NECESSARY. For more details see link:project-setup.html#submit_type[Change Submit Actions]. +\--use-content-merge:: + If enabled, Gerrit will try to perform a 3-way merge of text + file content when a file has been modified by both the + destination branch and the change being submitted. This + option only takes effect if submit type is not + FAST_FORWARD_ONLY. Disabled by default. + \--use-contributor-agreements:: If enabled, authors must complete a contributor agreement on the site before pushing any commits or changes to this
